From: Etienne Champetier <e.champetier@ateme.com>
Date: Tue, 26 Aug 2025 13:10:21 +0000 (-0400)
Subject: libostree: remove OSTREE_SUPPRESS_SYNCFS
X-Git-Tag: archive/raspbian/2025.7-2+rpi1^2^2~6^2~1^2~6^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=81d5602173812d8bda144a9576e1b1d020b69dd4;p=ostree.git

libostree: remove OSTREE_SUPPRESS_SYNCFS

This workaround was needed for the old valgrind version in EL 7
---

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 3f2f0419..cf48f94d 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1527,11 +1527,6 @@ _ostree_repo_syncfs (OstreeRepo *self, GError **error)
 
   if (self->disable_fsync)
     return TRUE;
-  /* FIXME: Added OSTREE_SUPPRESS_SYNCFS since valgrind in el7 doesn't know
-   * about `syncfs`...we should delete this later.
-   */
-  if (g_getenv ("OSTREE_SUPPRESS_SYNCFS") != NULL)
-    return TRUE;
 
   gboolean is_system = ostree_repo_is_system (self);
   if (is_system)
diff --git a/tests/libtest.sh b/tests/libtest.sh
index f8284101..24125b2f 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -180,7 +180,7 @@ fi
 
 CMD_PREFIX=""
 if test -n "${OT_TESTS_VALGRIND:-}"; then
-    CMD_PREFIX="env G_SLICE=always-malloc OSTREE_SUPPRESS_SYNCFS=1 valgrind -q --error-exitcode=1 --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/glib.supp --suppressions=${test_srcdir}/ostree.supp"
+    CMD_PREFIX="env G_SLICE=always-malloc valgrind -q --error-exitcode=1 --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/glib.supp --suppressions=${test_srcdir}/ostree.supp"
 fi
 
 if test -z "${OSTREE_HTTPD:-}"; then